add devfs patch to nozomi (from markus wigge)

SVN-Revision: 4760

diff --git a/openwrt/target/linux/package/nozomi/Makefile b/openwrt/target/linux/package/nozomi/Makefile
index 9e387320bfbed39889bd99aab645956004209b38..d3621bd94985ca2d9399c62989d5cba29a869b31 100644 (file)
--- a/openwrt/target/linux/package/nozomi/Makefile
+++ b/openwrt/target/linux/package/nozomi/Makefile
@@ -43,7 +43,6 @@ $(IPKG_KMOD_NOZOMI):
        install -m0755 -d $(IDIR_KMOD_NOZOMI)/lib/modules/$(LINUX_VERSION)
        install -m0755 -d $(IDIR_KMOD_NOZOMI)/etc/modules.d
        install -m0755 -d $(IDIR_KMOD_NOZOMI)/etc/init.d
-       install -m0755 $(PKG_BUILD_DIR)/S15nozomidev $(IDIR_KMOD_NOZOMI)/etc/init.d/S15nozomidev
        echo "pcmcia_core" > $(IDIR_KMOD_NOZOMI)/etc/modules.d/60-nozomi
        echo "yenta_socket" >> $(IDIR_KMOD_NOZOMI)/etc/modules.d/60-nozomi
        echo "ds" >> $(IDIR_KMOD_NOZOMI)/etc/modules.d/60-nozomi

diff --git a/openwrt/target/linux/package/nozomi/patches/001-devfs.patch b/openwrt/target/linux/package/nozomi/patches/001-devfs.patch
new file mode 100644 (file)
index 0000000..a532e57
--- /dev/null
+++ b/openwrt/target/linux/package/nozomi/patches/001-devfs.patch
@@ -0,0 +1,19 @@
+--- kmod-nozomi.orig/nozomi.c  2006-02-09 18:07:27.000000000 +0100
++++ kmod-nozomi/nozomi.c       2006-09-06 10:55:48.000000000 +0200
+@@ -2093,11 +2093,15 @@
+ 
+       td->magic                 = TTY_DRIVER_MAGIC;
+       td->driver_name           = NOZOMI_NAME_TTY;
++#ifndef CONFIG_DEVFS_FS
+       td->name                  = "noz";
++#else
++      td->name                  = "noz%d";
++#endif
+       td->major                 = NTTY_TTY_MAJOR,
+       td->type                  = TTY_DRIVER_TYPE_SERIAL,
+       td->subtype               = SERIAL_TYPE_NORMAL,
+-      td->flags                 = TTY_DRIVER_REAL_RAW | TTY_DRIVER_NO_DEVFS,
++      td->flags                 = TTY_DRIVER_REAL_RAW,
+       td->init_termios          = tty_std_termios;
+       td->init_termios.c_cflag  = B115200 | CS8 | CREAD | HUPCL | CLOCAL;
+ 

diff --git a/openwrt/target/linux/package/nozomi/patches/001-nozomi.patch b/openwrt/target/linux/package/nozomi/patches/001-nozomi.patch
deleted file mode 100644 (file)
index 95669d3..0000000
--- a/openwrt/target/linux/package/nozomi/patches/001-nozomi.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- nozomi/nozomi.c    2006-02-09 19:07:27.000000000 +0200
-+++ nozomi/nozomi.c    2006-03-02 19:20:30.000000000 +0200
-@@ -52,6 +52,7 @@
- #endif
- 
- #include <linux/module.h>
-+#include <linux/init.h>
- #include <linux/pci.h>
- #include <linux/ioport.h>
- #include <linux/tty.h>

diff --git a/openwrt/target/linux/package/nozomi/src/S15nozomidev b/openwrt/target/linux/package/nozomi/src/S15nozomidev
deleted file mode 100644 (file)
index 5ba5e6e..0000000
--- a/openwrt/target/linux/package/nozomi/src/S15nozomidev
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-# hack.. nozomi driver should register itself in devfs instead.
-mknod /dev/noz0 c 241 0
-mknod /dev/noz1 c 241 1
-mknod /dev/noz2 c 241 2
-mknod /dev/noz3 c 241 3